Don't steal menu events while the keyboard is grabbed.

2007-06-25  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkevents-quartz.c (gdk_event_translate): Don't steal
	menu events while the keyboard is grabbed.

svn path=/trunk/; revision=18231

diff --git a/ChangeLog b/ChangeLog
index fd10cbd2002ce4598741ac977d443bd348b21cef..d587b2956a2e1b5968dc282b06f9393421109745 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-25  Richard Hult  <richard@imendio.com>
+
+       * gdk/quartz/gdkevents-quartz.c (gdk_event_translate): Don't steal
+       menu events while the keyboard is grabbed.
+
 2007-06-25  Richard Hult  <richard@imendio.com>
 
        * gdk/quartz/Makefile.am:

diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index b1b39e092fb31299a1d110d865d09f7e39f57b36..c2a73c27c497396f751e8653f2b8786a23ae120c 100644 (file)
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -1533,7 +1533,9 @@ gdk_event_translate (NSEvent *nsevent)
   /* Special-case menu shortcut events. We create command events for
    * those and forward to the corresponding menu.
    */
-  if ([nsevent type] == NSKeyDown)
+  if ((!_gdk_quartz_keyboard_grab_window ||
+       (_gdk_quartz_keyboard_grab_window && keyboard_grab_owner_events)) &&
+      [nsevent type] == NSKeyDown)
     {
       EventRef event_ref;
       MenuRef menu_ref;